Workspace — Shared Agent Configuration.Merge Conflicts — Read Both Sides, Use muse resolve.⚠️ Never blindly use --ours or --theirs class

COUPLING PARTNERS

Co-modified in the same commits

• tests/test_phase7_bundle_atomicity.py TestTopologicalRetry
  1× 50%
• tests/test_phase7_bundle_atomicity.py TestTopologicalRetry.test_correct_order_still_works
  1× 50%
• tests/test_phase7_bundle_atomicity.py TestTopologicalRetry.test_newest_first_ordering_writes_all_commits
  1× 50%
• tests/test_phase7_bundle_atomicity.py _snap_dicts_for
  1× 50%
• tests/test_phase7_bundle_atomicity.py::import SnapshotRecord
  1× 50%
• tests/test_phase7_bundle_atomicity.py::import read_snapshot
  1× 50%
• tests/test_phase7_bundle_atomicity.py::import write_snapshot
  1× 50%
• tools/
  1× 50%
• AGENTS.md Workspace — Shared Agent Configuration.Branch Flow
  1× 50%
• AGENTS.md Workspace — Shared Agent Configuration.Branch Flow.code[bash]
  1× 50%
• AGENTS.md Workspace — Shared Agent Configuration.Code Intelligence
  1× 50%
• AGENTS.md Workspace — Shared Agent Configuration.Code Intelligence.table
  1× 50%
• AGENTS.md Workspace — Shared Agent Configuration.Commit Convention — Agent-First
  1× 50%
• AGENTS.md Workspace — Shared Agent Configuration.Commit Convention — Agent-First.Agent commit — always use this
  1× 50%
• AGENTS.md Workspace — Shared Agent Configuration.Commit Convention — Agent-First.Agent commit — always use this.code[bash]
  1× 50%